Merged by hand.
authormaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Tue, 19 Jul 2005 12:20:24 +0000 (12:20 +0000)
committermaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Tue, 19 Jul 2005 12:20:24 +0000 (12:20 +0000)
commitcca4eb996cc570b4d78657d19e38ffad78af536f
tree32d22e885abef42a69956863d41ee17399c1c984
parentb9f9f42b3f85d0e44223e0da01344e6975b288be
parentcadfa803a9e2f42f4c90ea9c11be3e60ee0e278c
Merged by hand.